Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Port Arachne & Oniro from EE, with some DV changes along the way #2817

Draft
wants to merge 33 commits into
base: master
Choose a base branch
from
Draft

Port Arachne & Oniro from EE, with some DV changes along the way #2817

wants to merge 33 commits into from
+1,936 −220

Conversation

Lyndomen
Copy link
Contributor

About the PR

Adds Cocooning, Vampire systems, and oneirophage things from EE + Nyano.

Why / Balance

Real spiders with cocooning and blood vampirism. Its neat and we used to have. Adds Oneirophage as a midround antag, a little buffed from the prebase days. arachne can be men now too.

adds delta displacement maps, midround antag spawn, rules, oneirophage art (pending) and a lil refactoring here and there of bloodsucking system and cocoon.

Technical details

Port. migrates the critical things from EE while using upsteam things when we can.

Media

image
image
image
image
image
image

Requirements

  • I have tested all added content and changes.
  • I have added media to this PR or it does not require an ingame showcase.

Breaking changes

Changelog Lyndomen, Mono, Kazne, Kushbreth
🆑

  • add: Ports Arachne from EE, a half spider race that survives off sucking the blood and spinning web.
  • add: Oneirophage has been reintroduced, a psionically invisible spider may prowl maints, hungry for your blood.

@Lyndomen Lyndomen requested review from a team as code owners January 30, 2025 00:02
@github-actions github-actions bot added S: Needs Review size/L 256-1023 lines Changes: YML Changes any yml files Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi labels Jan 30, 2025
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jan 30, 2025 •
edited
Loading

RSI Diff Bot; head commit 3103a87 merging into 004e3f7
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_DV/Mobs/Species/Arachne/displacement.rsi

State Old New Status
jumpsuit Added

Resources/Textures/_DV/Mobs/Species/arachne.rsi

State Old New Status
spider_body Added
spider_body_front Added

Resources/Textures/_DV/Mobs/Species/eyes.rsi

State Old New Status
eyes Added

Resources/Textures/_DV/Structures/cocoon.rsi

State Old New Status
cocoon1 Added
cocoon2 Added
cocoon3 Added
cocoon_large1 Added
cocoon_large2 Added
cocoon_large3 Added

Resources/Textures/_EE/Mobs/Customization/anytaur_masking_helpers.rsi

State Old New Status
female_full Added
female_none Added
female_top Added
full Added
male_full Added
male_none Added
male_top Added
none Added
top Added
unisex_full Added
unisex_none Added
unisex_top Added

Resources/Textures/_EE/Mobs/Customization/masking_helpers.rsi

State Old New Status
female_full Added
female_none Added
female_top Added
full Added
male_full Added
male_none Added
male_top Added
none Added
top Added
unisex_full Added
unisex_none Added
unisex_top Added

Resources/Textures/_EE/Mobs/Customization/spidereyes.rsi

State Old New Status
eyes Added

Edit: diff updated after 3103a87

@Lyndomen
Copy link
Contributor Author

i changed branch name and it fucked me over
anyway direction will be taking 3 day to review, i plan on yaml warrior buffing oneiro a bit and fixing evil displacement map and also new oneiro sprites

@sleepyyapril
Copy link
Contributor

whats next, you gonna port goob mechs too?

@Lyndomen
Copy link
Contributor Author

Lyndomen commented Jan 30, 2025 •
edited
Loading

whats next, you gonna port goob mechs too?

No, obliterating greentext is next
Or fixing footprints expiring, janitors have had it too easy for too long

@Avalon-Proto
Copy link
Contributor

whats next, you gonna port goob mechs too?

Im gonna try that one of these days actually :blunt:

deltanedas
deltanedas requested changes Jan 30, 2025
View reviewed changes
Copy link
Member

@deltanedas deltanedas left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the code is ancient shitcode looks straight out of nyano, refactor it and move to _DV as its nyano code
a lot of this should be in shared too, only methods touching bloodstream should be in server

@deltanedas
Copy link
Member

file scope etc too its 2025

@Aidenkrz
Copy link
Contributor

the code is ancient shitcode looks straight out of nyano, refactor it and move to _DV as its nyano code a lot of this should be in shared too, only methods touching bloodstream should be in server

I refactored all of the cocoon code :-(

@deltanedas
Copy link
Member

goob arachne where

@Monotheonist
Copy link
Contributor

Monotheonist commented Jan 31, 2025 •
edited
Loading

goob arachne where

Not on Goob.

Also a number of bugfixes for Lyndo to look at from there, and other things:
Fixing arachne turning into errors, useful if you haven't already done this
Spiderhusbands
Skubman's 80+ markings that apply to Arachne that may be useful for another PR

@Lyndomen
Copy link
Contributor Author

Lyndomen commented Jan 31, 2025 •
edited
Loading

goob arachne where

Not on Goob.

Also a number of bugfixes for Lyndo to look at from there, and other things: Fixing arachne turning into errors, useful if you haven't already done this Spiderhusbands Skubman's 80+ markings that apply to Arachne that may be useful for another PR

all of these are already in this pr real, thanks for heads up anyway !

@Lyndomen
Update chitinid.ftl
0603811 
Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>
@Lyndomen
Update item-cougher.ftl
136e701 
Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>
@Lyndomen
Update lifedrainer.ftl
22ba57a 
Signed-off-by: Lyndomen <49795619+Lyndomen@users.noreply.github.com>
@Lyndomen
move to shared gaming
ba0707d
@Lyndomen
Merge remote-tracking branch 'origin/spider-dating-sim' into spider-d…
fc5c04c 
…ating-sim
@Lyndomen
migrate to shared and small refactor
6a9f767
@Lyndomen
i have no idea B)
e7faa92
@Lyndomen
a
3103a87
@Lyndomen
Copy link
Contributor Author

Lyndomen commented Feb 4, 2025

moving this to draft, i dont have the bandwidth/skills to refactor yet

@Lyndomen Lyndomen marked this pull request as draft February 4, 2025 21:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@deltanedas deltanedas deltanedas requested changes

Requested changes must be addressed to merge this pull request.

Assignees
No one assigned
Labels
Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Needs Review size/L 256-1023 lines
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@Lyndomen @sleepyyapril @Avalon-Proto @deltanedas @Aidenkrz @Monotheonist